Applied a refactored patch of FELIX-218 since the original patch was 
removed when merging the plugin with FELIX-199.


git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@527501 13f79535-47bb-0310-9956-ffa450edef68
2 files changed