Merge branch 'master' into golos-v0.21.0

Author: afalaleev

plugins/json_rpc/include/golos/plugins/json_rpc/plugin.hpp

@@ -96,7 +96,7 @@ namespace golos {
                 APPBASE_PLUGIN_REQUIRES();
 
                 void set_program_options(boost::program_options::options_description &,
-                                         boost::program_options::options_description &) override;
+                                         boost::program_options::options_description &);
 
                 static const std::string &name() {
                     static std::string name = STEEM_JSON_RPC_PLUGIN_NAME;