Merge "Refactor to authorative TOSCA serializtion"