Merge changes I7ba60db8,Ib0afb414

* changes:
  Remove Python enables identical to global defaults.
  Update config to use self-contained python binaries