Update Godeps to add secondary or tertiary dependencies.
Reorder godeps to make the diff less wacky
One more reorder
Merge pull request #787 from control-center/feature/ZEN-13189

Update Godeps to add secondary or tertiary dependencies.