Fix for STRATOS-565: Adding support for tags as key-pair values
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos