HBASE-9195 Fix TestFDHDFSUtils against java7 test re-ordering (Himanshu Vashishtha)


git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1515828 13f79535-47bb-0310-9956-ffa450edef68
HBASE-9167 ServerCallable retries just once if timeout is not integer.max

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1515874 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/0.94' into 0.94-gd