resolved repo conflict and simplified FTICKS build

Resolving a repository conflict regarding tomcat6
(re-ordered sequence of execution for shib build)
simplifying the FTICKS build for faster execution