Added annotations to the AttributeDefinition object which ensure that required fields are not blank in addition to not being null.
Merge remote-tracking branch 'origin/master'