pyaschenko
committed
on 01 Mar 11
https://jira.jboss.org/browse/RF-10563
https://jira.jboss.org/browse/RF-10486
reviewed and additional tested by Anton Belevich