Restore !included test to correct location
Some other component (e.g. filter) may have already set the vary header so account for that.

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