Rebase from 'release/hydro/resource_retriever'
Placing rpm template files