SDP-153

21928	Removed hard-coding assumption of an Instance named 1. Now, one of two things must be true: P4BIN must be defined, as it would be if the SDP envrionment is loaded in the usual way (source p4_vars N), or else the 'p4' executable must be found in the path. Avoided removal of Swarm workspaces.
22006	Removed hard-coding assumption of an Instance named 1. Now, one of two things must be true: P4BIN must be defined, as it would be if the SDP envrionment is loaded in the usual way (source p4_vars N), or else the 'p4' executable must be found in the path. Avoided removal of Swarm workspaces.