Merge "Change default cirros ssh user"