fix handling of old style license, where the expiry is in the date entry

Change-Id: I383ff7e4ac45229752d0a6802299ac22cfaba152
Merge "fix handling of old style license, where the expiry is in the date entry" into branch-v2.7.1