Merge pull request EOSIO#988 from EOSIO/p2p-stat-271-gh916-5

fix for failure to start producing blocks EOSIO#916

Merge pull request EOSIO#934 from EOSIO/revert-genesis-json

Revert primary genesis.json to local testnet version.