FQA-661:[SELENIUM] Improvement on Gatein 3.5 branch