Updating module tool acceptance tests with new expectations.
Merge branch 'pvande-2.7.x' into 2.7.x

* pvande-2.7.x:
  Updating module tool acceptance tests with new expectations.
Merge branch '2.7.x' into 3.0.x

* 2.7.x:
  Updating module tool acceptance tests with new expectations.
Merge branch '3.0.x' into 3.1.x

* 3.0.x:
  Updating module tool acceptance tests with new expectations.
Merge branch '3.1.x'

* 3.1.x:
  Updating module tool acceptance tests with new expectations.

closes #1456
Merge remote-tracking branch 'upstream/master'