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