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