Merge branch 'spot5' of https://github.com/CS-SI/s2tbx into spot5

Conflicts:
	s2tbx-spot-reader/src/main/java/org/esa/beam/dataio/spot/dimap/SpotConstants.java