MFC of r260691:  - Fix indent.  - Minor clean up after DB5 migration.
MFC of r260691:
 - Fix indent.
 - Minor clean up after DB5 migration.

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