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