Cleanup template action_hooks directory.
Merge pull request #2060 from mrunalp/bug/py_clean_template

Merged by openshift-bot
Merge pull request #2061 from danmcp/master

Bug 951337
Postgres V2 snapshot/restore