lazutils: clean up

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@42359 4005530d-fff6-0310-9dd1-cebe43e6787f
lazutils: merged code

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@42360 4005530d-fff6-0310-9dd1-cebe43e6787f