NetDB: RI Publish improvements part 3

Only publish non-ff at shutdown if not restarting

router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java

@@ -137,9 +137,8 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad
     public synchronized void shutdown() {
         // only if not forced ff or not restarting
         if (_floodfillEnabled &&
-            (!_context.getBooleanProperty(FloodfillMonitorJob.PROP_FLOODFILL_PARTICIPANT) ||
              !(_context.router().scheduledGracefulExitCode() == Router.EXIT_HARD_RESTART ||
-               _context.router().scheduledGracefulExitCode() == Router.EXIT_GRACEFUL_RESTART))) {
+               _context.router().scheduledGracefulExitCode() == Router.EXIT_GRACEFUL_RESTART)) {
             // turn off to build a new RI...
             _floodfillEnabled = false;
             // true -> publish inline