When diffing the 2.0.6 tag (latest from 2.0 series) against the 2.0 branch, the only non-test related changes are in the following two files:

• magnolia-module-imaging/src/main/java/info/magnolia/imaging/caching/AbstractContentBasedCachingStrategy.java
• magnolia-module-imaging/src/main/java/info/magnolia/imaging/caching/CachingImageStreamer.java

The changes in AbstractContentBasedCachingStrategy.java seem to have been kept intact in the current trunk, but the case of CachingImageStreamer.java isn't as clear:

Between 2.0.6 and 2.0 branch:

svn diff -x -w http://svn.magnolia-cms.com/svn/enterprise/imaging/tags/magnolia-imaging-2.0.6/magnolia-module-imaging/src/main/java/info/magnolia/imaging/caching/CachingImageStreamer.java http://svn.magnolia-cms.com/svn/enterprise/imaging/branches/magnolia-module-imaging-2.0/magnolia-module-imaging/src/main/java/info/magnolia/imaging/caching/CachingImageStreamer.java

Between 2.0 branch and trunk:

svn diff -x -w http://svn.magnolia-cms.com/svn/enterprise/imaging/branches/magnolia-module-imaging-2.0/magnolia-module-imaging/src/main/java/info/magnolia/imaging/caching/CachingImageStreamer.java http://svn.magnolia-cms.com/svn/enterprise/imaging/trunk/magnolia-module-imaging/src/main/java/info/magnolia/imaging/caching/CachingImageStreamer.java

It looks like those changes were done for MGNLIMG-73.

If they are indeed completely ported to trunk/2.2, I would suggest remove the 2.0 branch altogether, as it seems the fixes are not complete on the 2.0 branch ?