Merge pull request #7732 from owncloud/datafolderexistence

Added .ocdata file to check for data folder validity

diff --cc lib/base.php
Simple merge

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

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