Lookup vault file

* Merged devel into boca's pull request at https://github.com/ansible/ansible/pull/8110 
* Fixed a small merge conflict
* Ran 'make tests'