Merge branch 'basic-oauth-configuration-SOAP-1036' into select-browser-for-consent-screen-SOAP-1121

Conflicts:
	soapui/src/main/java/com/eviware/soapui/impl/rest/DefaultOAuth2ProfileContainer.java
Merge branch 'select-browser-for-consent-screen-SOAP-1121' of https://github.com/SmartBear/soapui into select-browser-for-consent-screen-SOAP-1121