return 404 instead of 400
Merge remote-tracking branch 'upstream/master' into travis_ci
more fixes for change requiring tenant in url