Fix

Fix: Import roles resets the permission which are in export files. (Case 100996)
Fix: Change name of the user rights  "Project and Local settings and Components" and the user right "Common Settings and Components". (Case 85444)