Temp fixing on CARBON-14746
using osgi specified annotations for ds components and removing the usage of felix specific annotations. upgrading scr maven plugin version to be compatible with osgi specified annotations
using osgi specified annotations for declarative services components
merging m3 release with master