Fixed STRATOS-636 - Remove on termination and persistant mapping values are not set correctly
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
fixing STRATOS-634