Fix for ARIES-1147

Solution as suggested by John Ross.
Includes new unit tests.


git-svn-id: https://svn.apache.org/repos/asf/aries/trunk@1558324 13f79535-47bb-0310-9956-ffa450edef68