Changes to allow Build of 1.9 Documentation

These are changes in preparation for building 1.9 Documentation