Fix dependency issues that cause the server bundle to be built incorrectly

server/bnd.bnd

@@ -5,11 +5,12 @@ Import-Package: com.vaadin.sass.*;resolution:=optional,\
   com.liferay.portal.kernel.util;resolution:=optional,\
   javax.portlet*;resolution:=optional,\
   javax.validation*;resolution:=optional;version='${javax.validation.version}',\
-  org.atmosphere*;resolution:=optional,\
+  org.atmosphere*;resolution:=optional;version='${atmosphere.runtime.version}',\
   com.vaadin*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\
   *
 Export-Package: !com.vaadin.sass*,\
     !com.vaadin.shared*,\
     !com.vaadin.osgi.resources*,\
     !com.vaadin.osgi.push*,\
+    !com.vaadin.external*,\
     com.vaadin*;-noimport:=true

server/pom.xml

@@ -88,9 +88,9 @@
 
         <!-- Small reflection library -->
         <dependency>
-            <groupId>com.googlecode.gentyref</groupId>
+            <groupId>com.vaadin.external</groupId>
             <artifactId>gentyref</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.0.vaadin1</version>
         </dependency>
 
         <!-- OSGi API -->