Merge pull request #992 from clebertsuconic/master

this will help NFS/failover shutdown
Debug Statements - do not merge this on master