Rebase from 'rpm/indigo/innok_heros_driver'
Generated RPM files for 21
Renamed RPM spec file for 21