Apparently causes problems for some people.

Unfortunately the scp2 entries are "non-standard" so i've had to add
another variable to let the installer find it.

Change-Id: I7a01160369ed8dc401625c06760008341afcee67