(CE-1160, CE-1161) Apply maintenance fixes from MW 1.19.21 and 1.19.22

Apply maintenance fixes from the MW 1.19.21 and 1.19.22 releases. The security
fixes from MW 1.19.22 have already been applied. This applies the maintenance
fixes from those releases to keep up to date. Refer to the release notes added
for a summary of the changes.

@Wikia/community-engineering @owend