D-12940 reverting spring config changes, seeing NPE in logs on shutdown when not configuring distdatastore