Merge "Drop opentack_version from oscore-test-cookiecutter-model job"