A reworked version of changes in the !459 (closed) that do not break DSM api. Sorry for one big change log but splitting this into multiple commits would be quite difficult at this stage.. This do not contain split for different GA groups (Ds vs User) and do not have reordering issues. I have run basic tests on my setup and the normal groups are created properly, GA group is available in model when created from apartment.xml and also new ActiveGroup and DefaultGroup are available in model and JSON.