Merge "Add missing Tosca resource tables"