Fixing a build failure caused by unresolvable packages consumed by device.mgt.core and code cleanup

components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml

@@ -84,7 +84,8 @@
                             org.apache.catalina,
                             org.apache.catalina.core,
                             org.apache.commons.collections,
-                            org.wso2.carbon.email.sender.*
+                            org.wso2.carbon.email.sender.*,
+                            org.wso2.carbon
                         </Import-Package>
                         <Export-Package>
                             !org.wso2.carbon.device.mgt.core.internal,

components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml

@@ -85,8 +85,8 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Name>${pom.artifactId}</Bundle-Name>
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>OAuth Authenticator Bundle</Bundle-Description>
                         <Private-Package>