add error message to wait.until(....)
@rev gtorres@
@bug W-2348807@
Merging origin/lin/master-pending/add-failMsg into master