Merge "Merge TOSCA changes from RIFT to OSM"
authorvelandy <rajesh.velandy@riftio.com>
Thu, 27 Apr 2017 18:31:43 +0000 (20:31 +0200)
committerGerrit Code Review <root@osm.etsi.org>
Thu, 27 Apr 2017 18:31:43 +0000 (20:31 +0200)

Trivial merge