merging r15638 to r15801 selected-changesets-for-dataportal-to-drupal7 (contains latest updates from trunk which will not interfere to much with the current migration process)
merging r15638 to r15801 selected-changesets-for-dataportal-to-drupal7 (contains latest updates from trunk which will not interfere to much with the current migration process)