ECMS-4409 New folder in Content Explorer
ECMS-4522 Folder types in drive edit screen are not in alphabetic order
Merge remote-tracking branch 'origin/master' into feature/relooking