Merge "Fix CIFS access for non-multitenant setup"