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