Simplify code in DefaultPath by using guava iterators
Merge branch 'master' into cleanup
make field final and remove unused imports
clean up comments
Merge branch 'cleanup'