SAL_OVERRIDE, vclplug warnings_not_errors redux

Change-Id: I2ada77879dd8795184ad615654d0cf80371cce52