Merge "Fixed NPE in hashCode() with null strings" into jb-ub-mail