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