Merge "Add OPENSTACK_ENVIRONMENT property to oscore cookiecutter jobs"