NullPointerException when pressing "reload" in the server status panel

The NPE is due to the following code at line 266 in GeoServerImpl

        // reload configuration
        GeoServerLoader loader = GeoServerExtensions.bean(GeoServerLoader.class);
        synchronized (org.geoserver.config.GeoServer.CONFIGURATION_LOCK) {
            getCatalog().getResourcePool().dispose();
            loader.reload();
        }

After the recent changes there is no more a GeoServerLoader registered in the
spring context, but a GeoServerLoaderProxy instead.

The issue seems solvable by just looking for the proxy, but I'm wondering if it's
the right thing to do.

Justin, what do you think?

(btw, we should cover this one with a test)