Moved ogrinfo XML changes from my local changes into GitHub repo
Updated ogrinfo test to reflect changes to diagnostic message reporting