fix option to turn off basic auth
Merge pull request #1266 from edx/jarv/fix-basic-auth

fix option to turn off basic auth
Merge pull request #1267 from edx/release

Release