More stringent check for enabling, removed superfluous die
Merge pull request #2364 from xisi/dev-memcache-sasl-support

Memcache SASL fixes