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