Merge fix for bug 1993. Fix for bug 2707 included in delivery.
EXPORTS
?CheckDrmRightsStorageDriveL@DrmRightsStoringLocation@@SAHAAVRFs@@AAW4TDrmScheme@@AAVTChar@@@Z @ 1 NONAME ; int DrmRightsStoringLocation::CheckDrmRightsStorageDriveL(class RFs &, enum TDrmScheme &, class TChar &)