Rework the RTSOL logic from previous patch (it was wrong)
Rework the RTSOL logic from previous patch (it was wrong)

PR:		26187 && 24136
Submitted by:	Glenn Trewitt <trewitt@trewitt.org>

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