Common refactor - Fix ora & xqueue

Cf https://github.com/edx/configuration/pull/381 and #379 - I've put only the fixes to get ora working from #381.