MFC rev. 1.21 to RELENG_6: Code factoring and simplification. PR:		bin/102354 Submitted by:	Ricardo Nabinger Sanchez <rnsanchez@gmail.com>
MFC rev. 1.21 to RELENG_6: Code factoring and simplification.
PR:		bin/102354
Submitted by:	Ricardo Nabinger Sanchez <rnsanchez@gmail.com>

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