rearranged bosh cli commands