[WFLY-3324] Ensure the POJO's are removed for custom handlers.
Merge pull request #6250 from jamezp/WFLY-3324

[WFLY-3324] Ensure the POJO's are removed for custom handlers