Fix stomping bug in admin switchboard

An attempt to fix this scenario, which has occurred several times:
if user1 renders page, user2 renders page, user1 saves and then user2 saves, user1's changes will be lost.
Improve conflict error message
Merge pull request #1744 from guardian/kc-switches-stomp

Fix stomping bug in admin switchboard