Merge Jenkins test additions from master into staging.