trace cleanup merge: compare array data not traces, also merging traces
that have some discrepancies in extra stats header like e.g. mseed
because originating from different files
Merge branch 'releases'

Conflicts:
	obspy/core/stream.py
Merge branch 'master' into quakeml_namespaces