Merge existing changes from pywr-master-compat as base for unified version

[pmslavin]

Further changes from pywr-direct-global-parameters will be added manually or reimplemented as required.