Rebase from 'rpm/jade/catkin'
Generated RPM files for 21
Renamed RPM spec file for 21