We have decided to revert splitting shipper into 2 binaries.
This is the first PR, this puts master back at the same point of v0.8.0.
After this other PRs will be opened for cherry-pick commits from v0.8. and useful changes from v0.9 that are unrelated to the split (other v0.8. commits were after som of v0.9 ones which forces us to cherry-pick them).
We have decided to revert splitting shipper into 2 binaries. This is the first PR, this puts master back at the same point of v0.8.0. After this other PRs will be opened for cherry-pick commits from v0.8. and useful changes from v0.9 that are unrelated to the split (other v0.8. commits were after som of v0.9 ones which forces us to cherry-pick them).