Merge branch 'automatic-proxy-detection-SOAP-454' into ready-for-testing

Conflicts:
	soapui/src/main/java/com/eviware/soapui/SoapUI.java