refs #2572: Drupal code guidelines applied on migration code
refs #2609,#2603 - Commented out broken code