TRUNK-3909, backport edit_privileges liquibase changes

@ dkayiwa: if you still have questions about this please ping me on irc. i think @mseaton would like to have this fix check in quick so he could work on upgrading the Malawi system too. thanks.