Protect Acid XBlock test from stale element or zero-length locator list
Merge pull request #2639 from edx/will/bok-choy-test-robustness

Will/bok choy test robustness