reorder after each to close at the correct time
reorder after each to close at the correct time

[#157577905]

Co-authored-by: Anand Gaitonde <4f0ff06b2390eeadb0769d298cbdb3dc6df4c73d@pivotal.io>

cloudfoundry/cli,cloudfoundry/cli,cloudfoundry/cli