more fixes to entity to match schema, CRM-14311

----------------------------------------
* CRM-14311: Add metadata to doctrine entities
  http://issues.civicrm.org/jira/browse/CRM-14311