Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54450
Correctly handle resource injection when part of the servlet properties uses @Resource and the other uses 'injection-target'
Includes test case
Patch provided by  Violeta Georgieva.

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