Cleanup resolver code to match latest Apache Felix Change-Id: I25b526a546bcfbaedef6368104b561fdce7ce09e Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>