Suspend Governor: Merge old config option into suspend_gov feature