We decided to merge changes in release/v0.37.1 into v0.37.x and then run our QA again on v0.37.x

It seems that we added only a few commits into release/v0.37.1 compared to what was in v0.37.x (not including the renaming done). Therefore it will be easier to cherry-pick those commits individually then to merge the entire branch and resolve all the conflicts that will inevitably happen due to the renaming.

Commits to cherry-pick:

• cli: add --hard flag to rollback command to remove block as well #217
• v0.37.x: port p2p bugfix #215
• Introduce this reverted change that is present in releases/v0.37.1. Cheery pick the following commit.