Resume ui tests build by defining adapter, refs #4233
Merge remote-tracking branch 'origin/master'