MBS-7763: Relationships with attributes are not editable
Merge remote-tracking branch 'bitmap/mbs-7763'

* bitmap/mbs-7763:
  MBS-7763: Relationships with attributes are not editable
Merge branch 'master' into beta