Update OpenStack Orchestration to Orchestration module

Change-Id: Iabcb6dc3e6d3869dd6c8eed8da1af588e75ce5f8
backport: stable/havana
Closes-bug: 1277105
(cherry picked from commit efaae9779198de6c88bb93550e6e1707595a22d5)
Merge "Update OpenStack Orchestration to Orchestration module" into stable/havana