Modified to use new ESRF production ISPyB server
Merge branch 'master' of github.com:edna-site/edna
Merge branch 'master' of github.com:edna-site/edna
Merge branch 'master' of github.com:edna-site/edna
Merge branch 'master' of github.com:edna-site/edna
Merge branch 'master' of github.com:edna-site/edna
Merge branch 'master' of github.com:edna-site/edna
Merge branch 'master' of github.com:edna-site/edna
Merge branch 'master' of github.com:edna-site/edna
Merge branch 'master' of github.com:edna-site/edna
Merge branch 'master' of github.com:edna-site/edna
Merge branch 'master' of github.com:edna-site/edna
Merge branch 'master' of github.com:edna-site/edna
Merge branch 'master' of github.com:edna-site/edna
Merge branch 'master' of github.com:edna-site/edna
Merge branch 'master' of github.com:edna-site/edna

Conflicts:
	mxPluginExec/conf/XSConfiguration_ESRF_ISPyB_Common.xml