#5849 arraylist of token instead of linked next-next-next...
fix #5849 clean up & junit test

Conflicts:
	test/com/AllTestsSuite.java
#5849 missing in master merge
Merge pull request #5853 from dotCMS/issue-5849-stackoverflow-velocity-serialize-masterMerge

Issue 5849 stackoverflow velocity serialize master merge