Merge "Merge TOSCA changes from RIFT to OSM"