Rf 13301

These commits solve https://issues.jboss.org/browse/RF-13301 . 
Thank you
I belive that getContentElement should be fine. But like in comment before, I didn't change method name, beacase it already exists. 
If name getContentElement is fine then I change it.