cherry picking r13961 r14262 from http://dev.e-taxonomy.eu/svn/branches/drupal/Kew_dataportal/
AT: committing fixes post UAT
Merging branches/drupal/Kew_BugFixing#r13341 through branches/drupal/Kew_BugFixing#r13654 into /home/andreas/workspaces/_svn-trunk/drupal/5.x
fixing #2679 (Improve Concept Relationships for Dataportal)
reorganizing drupal sub repository: sparate folders per version 5.x, 6.x & 7.x