[Self-hosted Mender 1.7] Deployment Stalls at 99%

Thanks @boomtown-dd for the feedback.

I have created a bug for this for further investigation,

https://tracker.mender.io/browse/MEN-2464