Cherry-picked pulled request and pushed upstream: https://github.com/jboss-jdf/ticket-monster/commit/45d600b0ef1a948f678d11a8652f40e2a97e68d5
Cherry-picked pulled request and pushed upstream: https://github.com/jboss-jdf/ticket-monster/commit/45d600b0ef1a948f678d11a8652f40e2a97e68d5