Updated cloud status to handle pools more gracefully.
Merge branch 'test' into dev