Check that there is an unblocked user in the sysop group

Also other minor cleanup

Change-Id: I088de0cfe0fe252296cf563d1bfa70a8e74ed629
Merge "Check that there is an unblocked user in the sysop group"