HADOOP-11352 Clean up test-patch.sh to disable "+1 contrib tests"