Use new stack macros from gjjb csit-openstack