fixing cartridge properties overwriting issue - this is a temp fix, need to fix properly
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos