Revert "escalator should use oslo.xxx instead of oslo-xxx"