Review PR-2926: Ansible single inventory file

@maspwr @mitchellh: Here are the changes I would like to add to original #2926 pull request. Do you agree with this? Review back will be appreciated a lot :smile: 

Related to #2679.