Merge branch 'feature/ZP-1209-autodiscover-apply-a-configurable' into bugfix/ZP-1214-autodiscover-should-check-for-credentials