Our 'development' branch in agnosticd fork has diverged too much.

This leads to more problem that it solved initially. 
The way forward would be to use a "big hammer" and completely force-push the code from the upstream branch into our fork. 

• create a NEW branch which will snapshot the current state of the branch
• overwrite the 'development' branch in our fork to match upstream
• cherry-pick changes which need to be applied to the new/fresh branch and create those in a separate branch. 
  • create PR from this branch against the upstream agnosticd.
  • pull the agnosticd 'development' branch after merge, and push into our fork