Do not silently dismiss unapplied document changes when adding module

Part of #9356
Do not warn about changed modules when changing modules.

Part of #9356
Also fixes #9365
Merge remote-tracking branch 'github/build-bot-2.1.x' into bleeding-edge-2.1.x
2014.12.25-10.00