Merge "Don't always validate restServerParameters"