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