NewFix_SOAP-984_SOAPUI-4566

https://smartbearsweden.atlassian.net/browse/SOAP-984
http://jira.sthlm.smartbear.local/browse/SOAPUI-4566