branch for IMAGING-120 refactoring

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/imaging/branches/IMAGING-120@1537257 13f79535-47bb-0310-9956-ffa450edef68