- Fix issue when X-FreeBSD-CVS-Branch is not HEAD.
- Fix issue when X-FreeBSD-CVS-Branch is not HEAD.

Submitted by:	jkim
Approved by:	jkim

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