CRM-11879 further fix on relationship api
IN PROGRESS - task 3220: Map from civi relationship
to
Drupal
role

http://redmine.fuzion.co.nz/issues/show/3220
Merge branch '4.2-master' of ssh://git@github.com/fuzionnz/civicrm.git into 4.2-master