Merge "Update oscore-test-cookiecutter-model"