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