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