Merge "BUG-2953 : Unable to read from datastore root with clustering enabled"