Need to remove the (1) Non-UEF HPWH & (2) HPWH (2013 being phased out) options from both CBECC and CBECC-Res.
For Non-UEF Rated HPWHs - If the water heater status = New or Altered, the user should not be allowed to select the "Non-UEF" rated HPWH option. However, we want to continue to allow this option if the status = Existing.
For HPWH (2013 being phased out) - This option can be completely removed.
enumeration and ruleset mods checked into SVN @ r2334