#6285 : Changing order of test cases, timeout values, and String values.
#6285 Fix ContentletAPITest
Merge remote-tracking branch 'origin/master' into issue-6285-unit-tests-failing
#6285 Refactor after the merge with master
Merge pull request #6452 from dotCMS/issue-6285-unit-tests-failing

Issue 6285 unit tests failing