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