Code cleanup
Merge branch 'next' of https://github.com/SmartBear/soapui into next