ARIES-355: Web itests clean up. Should address occasional test failures. Based on patch from Bartek Kowalewski.