Rebase from 'rpm/hydro/map_merger'
Generated RPM files for heisenbug
Renamed RPM spec file for heisenbug