Add the generic components to create two-chunk scenarios. Includes small scenario fixes for things like system tables that are not identical between OG and NG (also see #4111.) Ref #3934.