Merge "Add extra authorative TOSCA concepts"