Merge "Use common create_keypair method for autoscaling"