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