Merge branch '8.x' of https://github.com/r0bb3n/geotools into 8.x

Conflicts:
	modules/library/jdbc/src/main/java/org/geotools/jdbc/JDBCJoiningFeatureReader.java
	modules/library/jdbc/src/test/java/org/geotools/jdbc/JDBCJoinTest.java