Merge "Update config to use self-contained python binaries"