Fix return statement inside inlineCallbacks (OMS-560)
Merge branch 'oms-560'