clean up schema migrations

NOTE: apparently the hook_update_N return value is being ignored.
No idea how long that's been the case.  We should rewrite any updates
which should fail hard to use exceptions.

Change-Id: I3ac0a8f6bbed342d75ed4b5d26e435626297de68
Merge remote-tracking branch 'origin/master' into HEAD