Now apply local changes to make this compile in 2.2-current (sorry about delay between commit of original author's sources and my changes - I was called away).
Now apply local changes to make this compile in 2.2-current (sorry about
delay between commit of original author's sources and my changes - I was
called away).

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