PROV-788 Fixed datamodel issues found in unit test
PROV-787 Change backupGlobals setting

Since we heavily rely on globals being changed through the course of a
unit test (which is kind of counter-intuitive in unit testing) we need
to make sure PHPUnit allows this.
Merge remote-tracking branch 'upstream/master'