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