Victor Poughon authored Jun 18, 2018 and Guillaume Pasero committed Feb 06, 2019

Conflicts:
	Modules/Core/ImageBase/include/otbImage.h
	Modules/Core/ImageBase/include/otbVectorImage.h
	Modules/IO/ImageIO/include/otbImageFileReader.h
	Modules/IO/ImageIO/include/otbImageFileWriter.h