remove php notice, add label to dropdown
Merge branch '7.x-4.x_#739_expose_contact_form_in_webform_user' into 7.x-4.2.4-RC2