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