correcting spelling mistakes in getServiceGroupDefinition
Merge branch '4.0.0-grouping' of https://git-wip-us.apache.org/repos/asf/stratos into grouping
fixing minor log issues
change CompositeApplication according to the last Json format
moving beans to manager
persist CompositeApplication