refs #2572: Drupal code guidelines applied on migration code
refs #2609,#2603 - Commented out broken code
refs #2572: Friday evening @ work is not cool
Merge branch 'develop' of https://github.com/eu-osha/osha-website into develop