YARN-2927. [YARN-1492] InMemorySCMStore properties are inconsistent. (Ray Chiang via kasha)

(cherry picked from commit 120e1decd7f6861e753269690d454cb14c240857)
Merge remote-tracking branch 'remotes/origin/branch-2' into branch-2