Backport fixes

Backports the fix for the config reverse contains logic, and about creating more jobconf's than necessary