Fixed intermittent build failures by looking for both image title selectors.
Merge pull request #2710 from refinery/fix-intermittent-build-failures

Fixed intermittent build failures by looking for both image title selectors