Fixing #857: hpx::naming::locality leaks parcelport specific information into the public interface
Merge branch 'master' into fixing_857

Conflicts:
	hpx/runtime/parcelset/decode_parcels.hpp
Reverting accidently commited change
One more accidently commited change
Making ibverbs parcelport work again
Merge pull request #1312 from STEllAR-GROUP/fixing_857

Fixing #857: hpx::naming::locality leaks parcelport specific information into the public interface