MFC 1.48: sync with vap code base; updates for 11n support and some   	  general code cleanups
MFC 1.48: sync with vap code base; updates for 11n support and some
  	  general code cleanups

Approved by:	re (kensmith)

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