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