Point merge of a fix for --strip-components.  I'm going to wait a little longer before I merge the rest of r179322.
Point merge of a fix for --strip-components.  I'm going to
wait a little longer before I merge the rest of r179322.

PR:		bin/121158

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