Totally botched ths patch...revert back to Rev 1.7, and request a proper context diff from the submitter...
Totally botched ths patch...revert back to Rev 1.7, and request a
proper context diff from the submitter...

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