Fixed NPE that occurred during shutdown in GatewayPluginServiceImpl and PortalPluginServiceImpl
Working on #321 (Update to WiseML 2.0)