Rebase openstack-tripleo-heat-templates-compat to 2e6e548 to pull in current version
*** This bug has been marked as a duplicate of bug 1483729 ***