Manually copied files that did not get merged over from ansible branch
2 files changed