6783

Reduce conflict with min's PR, but don't eliminate them. In particular the js content manager remove the check for 400 statuses.