DEN-12121: Unborked staging
cherry pick of "Merge branch '
DEN-12224-dg_hd_dev-switches-monitor' of ssh://dvm-linux02:7999/hd/hdfirmware into
DEN-12224-dg_hd_dev-switches-monitor".
Sync'd hdfirmware with common defs that were in staging. Fixed compilation errors that occurred due to reorganization.