Merge branch 'stable-2.6'

* stable-2.6:
  Shift the change table's dataCell CSS a bit
  Fix: wrong error message on MyWatchedProjectsScreen
  Upgrade Apache SSH dependency to 0.6.0

gerrit-common/src/main/java/com/google/gerrit/common/errors/NoSuchEntityException.java

@@ -23,4 +23,8 @@ public class NoSuchEntityException extends Exception {
   public NoSuchEntityException() {
     super(MESSAGE);
   }
+
+  public NoSuchEntityException(String message) {
+    super(message);
+  }
 }

gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css

@@ -514,6 +514,8 @@ a:hover {
   padding-right: 5px;
   border-right: 1px solid trimColor;
   border-bottom: 1px solid trimColor;
+  vertical-align: middle;
+  height: 20px;
 }
 
 .changeTable a.gwt-InlineHyperlink {

gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java

@@ -72,7 +72,11 @@ public class BaseServiceImplementation {
     } catch (InvalidQueryException e) {
       callback.onFailure(e);
     } catch (NoSuchProjectException e) {
+      if (e.getMessage() != null) {
+        callback.onFailure(new NoSuchEntityException(e.getMessage()));
+      } else {
         callback.onFailure(new NoSuchEntityException());
+      }
     } catch (NoSuchGroupException e) {
       callback.onFailure(new NoSuchEntityException());
     } catch (OrmRuntimeException e) {