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