Fix building bellman constraints for both with model and no model.
Fix merging conflict in rope_qlearn