Refactor to use changes made to generic table to support jBPM.
(cherry picked from commit 7dc46994007c9c34534febc574ca1d8c9a57ec1e)