Fix unit test broken by switch to LinkedHashSet

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1524725 13f79535-47bb-0310-9956-ffa450edef68
Always load container SCIs first

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