fix builder generic type
Revert "fix builder generic type"

This reverts commit 51f54f0decbda47ecbae976c375b387ae6570a41.
Merge branch 'master' into 'BS-10213_bundle_Jboss7'