AS7-6280 Convert client-mappings to ObjectTypeAttributeDefinition; support expressions