PTFM-10153: partial progress

Conflicts:

	src/python/dxpy/scripts/dx.py
	src/python/test/test_dxclient.py