Progress on #472: Fix renaming behavior during name conflicts

If there are two keys with the same contact name, and one is registered,
always rename the unregistered one.
Merge branch 'master' of github.com:BitShares/bitshares_toolkit