Fix for issue STRATOS-587
fixing STRATOS-485
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos