merging branches/cdmlib/2.2 [7345:7377] to trunk
see also: https://dev.e-taxonomy.eu/trac/changeset?new=branches%2Fcdmlib%2F2.2%407377&old=branches%2Fcdmlib%2F2.2%407345