Merge branch 'master' into yuryninog-patch-1

CONTRIBUTING.md

@@ -7,8 +7,8 @@ The basic process is pretty simple:
 * Fork the Project
 * Create your Feature Branch<br>`git checkout -b feature/AmazingFeature`
 * Commit your Changes<br>`git commit -m 'Add some AmazingFeature`
-* Make sure Terraform linting is ok (hint: `terraform format`)
 * Make sure tests pass!<br>`pytest # in the root folder`
+* Make sure Terraform linting is ok (hint: `terraform fmt -recursive` in the root folder)
 * Make sure any changes to variables and outputs are reflected in READMEs<br>`./tools/tfdoc.py [changed folder]`
 * Push to the Branch<br>`git push origin feature/AmazingFeature`
 * Open a Pull Request