CORE-1914 os-collect-config should be left running

This commit changes the update_cloud logic to ensure
os-collect-config is running as one of the last steps
on each class of node.

Change-Id: Ie06ffe28423d7bf8ede4ce8ea4e9811a7f325ae5