Index: src/deploy/ear/META-INF/jboss-deployment-structure.xml
===================================================================
--- src/deploy/ear/META-INF/jboss-deployment-structure.xml	(revision 20434)
+++ src/deploy/ear/META-INF/jboss-deployment-structure.xml	(working copy)
@@ -7,6 +7,8 @@
             but then we would have to do build.xml magic to only include it when XKMS is enabled. Since we have no XALAN of our own included 
             we might as well export the system one. -->
             <module name="org.apache.xalan" export="true"/>
+            <!-- Force JSF libraries to be loaded, to prevent Tomahawk for crashing on Admin GUI load after JBoss restart. -->
+            <module name="javax.faces.api" export="true" slot="1.2"/>
         </dependencies>
         <!-- Using Oracle JDK and JBoss 7 signature verification on crypto providers do not work unless we specify to use-physical-code-source. 
         See https://issues.jboss.org/browse/WFLY-5 -->