Created by: bbockelm
Some fairly straightforward bugfixes from ITB testing of "local users" features.