try to cleanup the code, always do the configuration in the same order

git-svn-id: svn://svn.code.sf.net/p/htmlunit/code/trunk@9170 5f5364db-9458-4db8-a492-e30667be6df6