[ORB-226] - duplicate hosnum not allowed if configured so
Merge remote-tracking branch 'origin/release/orbis-r2' into release/orbis-r2