Pull in configuration for Python configuration #3555

Basically, cherry picking a change from master onto V7_9_5-branch to
stop spurious build failures in the Batlab.
Merge branch 'V7_9_5-branch'

Essentially, this is a "ours" strategy merge, as our change for V7_9_5
is already subsumed under changes in master

Conflicts:
	nmi_tools/glue/build/remote_pre