common fixes for guava_version_upgrade#82

AbhishekKumar9984 wants to merge 2 commits into

cdapio:cs_guava_upgradecdapio/common:cs_guava_upgradefrom

cloudsufi:common3_guava_upgradecloudsufi/common:common3_guava_upgradeCopy head branch name to clipboard