https://bugzilla.redhat.com/show_bug.cgi?id=1054685, https://issues.jboss.org/browse/DTGOV-113
Merge pull request #153 from KurtStam/master

https://bugzilla.redhat.com/show_bug.cgi?id=1054685, https://issues.jbos...