HBASE-10845 Memstore snapshot size isn't updated in DefaultMemStore#rollback()


git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1587628 13f79535-47bb-0310-9956-ffa450edef68
HBASE-10987 Increase timeout in TestZKLeaderManager.testLeaderSelection.

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1587696 13f79535-47bb-0310-9956-ffa450edef68