Checking deployment validations for bug 1023381, 1023304
Fixing tests