[jvstm-ojb] Moved consistency predicate generation out of the CP module.

  * This commit reverts the changes added in 4fdeda724b