Merge pull request #1226 from pmienk/master

Standardize optional libgssapi_krb5 dependency