Merge "Revert "Revert "Bump cirros version to 0.6.1"""