Update OpenStack Orchestration to Orchestration module

Change-Id: Iabcb6dc3e6d3869dd6c8eed8da1af588e75ce5f8
backport: havana
Closes-bug: 1277105
Merge "Update OpenStack Orchestration to Orchestration module"