create a branch to attempt some refactornig and a fix for CONTINUUM-2563


git-svn-id: https://svn.apache.org/repos/asf/continuum/branches/CONTINUUM-2563@1391316 13f79535-47bb-0310-9956-ffa450edef68