Merged revision 1564461 from tomcat/trunk:
According to JavaEE specification (EE.5.4.1.3) when an env entry is specified in the web deployment descriptor and with annotation then the definition in the web deployment descriptor is with priority.


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