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