Fix CRM-12008 - avoid Drupal notices in form layer