Fix internal ordering of ORBEndpoints
BZ983 Fix for interceptors and restarted server