(IdManagement) Fixing logical merge issue when rebasing to master.
(IdManagement) Fixing logical merge issue when rebasing to master.

mrvisser/Hilary,stuartf/Hilary,timdegroote/Hilary,nicolaasmatthijs/Hilary,simong/Hilary,Coenego/Hilary,Orodan/Hilary,Orodan/Hilary,stuartf/Hilary,ExC0d3/Hilary,nicolaasmatthijs/Hilary,ExC0d3/Hilary,jfederico/Hilary,mrvisser/Hilary,simong/Hilary,timdegroote/Hilary,jfederico/Hilary