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

Also AS7-6271 -- correct expression validation in complex attribute definitions