Import BrokenPromise
Merge pull request #2789 from edx/zoldak/fix-ora-test

Import BrokenPromise