Refs #1226 Cross domain middleware setup.py issues
Merge commit '34c94a72772f687c2e2b4c1a0b129c5a6e68a126'