Merge "skip overlimit tests when default quota set is -1"