Merge "ServerPluginProvider: Fix javadoc warnings"