Make sure we're only logging admin activity
Merge pull request #1088 from elzj/bot_logging_fix

Issue 3480: Make sure we're only logging admin activity
3491 remove livevalidation from change username form
Merge pull request #1089 from sarken/issue_3491

3491 remove livevalidation from change username form
Deprecation fix: replacing & with merge for relation merging
Merge pull request #1090 from elzj/merge_deprecation_fix

Deprecation fix: replacing & with merge for relation merging