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