Fix misc. issues flagged in PR validation build of #7421#7423

virajjasani merged 1 commit intoapache:HBASE-29368-key-management-featureapache/hbase:HBASE-29368-key-management-featurefrom

haridsv:stabilize-initial-phaseharidsv/hbase:stabilize-initial-phaseCopy head branch name to clipboard