Merge pull request #143 from Mirantis/pr_validate2_x_cookiecutter

Validate (2nd) against latest cookiecutter