Merge "Allow kwargs in nova_volume_attach"