'enable encryption' in security settings fixed
Merged 'dev'.
update icon-list position in cm-security-aspects
Merge remote-tracking branch 'origin/feature-remove-bootstrap-new-less-structure' into feature-remove-bootstrap-new-less-structure