Merge "allow create_server with vnic_type and port_profile from kwargs"