FELIX-4389 Apply patch by Tobias Bocanegra fixing field hiding issue (thanks for the patch!)

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