Remove unnnecessary changes in gt-main.

Remove unnecessary changes.
Merge branch 'gmlclientlib' of https://github.com/riniangreani/geotools into myclientlib

Conflicts:
	modules/library/main/src/main/java/org/geotools/data/DataAccessFinder.java
	modules/library/main/src/main/java/org/geotools/feature/AttributeBuilder.java