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