PDFBOX-2456: add content stream compare, some cleanup

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