Cleanup the VAR_JUNK handling.
Cleanup the VAR_JUNK handling.

Patch:		7.136

Submitted by:	Max Okumoto <okumoto@ucsd.edu>

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