Cleaned up cartridge-config.properties file and PersistenceManager related unwanted code, fixing STRATOS-274 and STRATOS-416
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Further code and config clean up
Resolving conflict in ServiceUtils.java