FELIX-4590 : [Core R6] Update to R6 API

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1614569 13f79535-47bb-0310-9956-ffa450edef68
FELIX-4580 : [Core R6] Support service.bundleid Service Registration property

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