Some DIAGNOSTIC code was enabled all of the time in error.   The diagnostic code is now conditional on #ifdef DIAGNOSTIC again.
Some DIAGNOSTIC code was enabled all of the time in error.   The
diagnostic code is now conditional on #ifdef DIAGNOSTIC again.

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase