Spark-3177 & SPARK-3175

SPARK-3177 : Yarn-alpha ClientBaseSuite Unit test failed
SPARK-3175 : Branch-1.1 SBT build failed for Yarn-Alpha