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