Changes required to run on v 15#425

RosSinch wants to merge 5 commits intoOCA:15.0OCA/queue:15.0from

opsway:changes_required_to_run_on_v_15opsway/queue:changes_required_to_run_on_v_15Copy head branch name to clipboard