Merge "mediawiki.user: Minor clean up of code and unit tests"