SLING-3658 - Could not publish to the server.
java.util.NoSuchElementException

Correct the reordering implementation and make it more resilient.

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