Refs #7849. Making sure things get/keep current state.
Refs #7849. Fixing test.
Merge remote-tracking branch 'origin/bugfix/7849_rebinner_nbn_behavior'