Rebase from 'release/indigo/roseus_smach'
Placing rpm template files
Rebase from 'rpm/indigo/roseus_smach' (no changes)
Generated RPM files for 21
Renamed RPM spec file for 21