Supporting new group and application JSON formats STRATOS-1018
Fixing merge conflicts and NPE s
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos