Merge Partners feature nearing completion.

Migration bug fix.
Merge from trunk
Unit tests started
Merge Partner and Merge Partner tests finished.
merge from trunck
merge from lp:~peter-simpson/openpetraorg/dev_0001204_merge_partners