Merge pull request #11747 from owncloud/storeCredentialsOnlyInSessionIfRequired

Store credentials only in session if required

diff --cc config/config.sample.php
Simple merge

diff --cc lib/private/repair.php
Simple merge

diff --cc lib/private/setup.php
Simple merge