Support indexing fields of type java.util.UUID
Fix checkstyle
Merge pull request #3600 from markathomas/master

Support indexing fields of type java.util.UUID