PROW-151: Code simplication using some guava, Maps.newHashMap() +review CR-10662