commiting changes provided by Chanaka Jayasena, STRATOS-359
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Using jclouds 1.6.2-incubating
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos