HBASE-12692 NPE from SnapshotManager#stop (Ashish Singhi)
Merge remote-tracking branch 'remotes/origin/0.94' into 0.94