ENG-761

git-svn-id: http://svn.terracotta.org/svn/ehcache@8585 b9324663-ca0f-0410-8574-be9b3887307d
MNK-5915 Make sure we don't try to remove faults when emergency valve is involved

git-svn-id: http://svn.terracotta.org/svn/ehcache@8586 b9324663-ca0f-0410-8574-be9b3887307d