Daniel Templeton Attaching the patch. Please provide code review for the same.
Note: I have added explicit guava dependency in the pom.xml. I did a dependency:analyze to verify it is clean. I did found few warnings from it unrelated to my patch. Let me know if you like me to log a separate JIRA for that.