Making sure we look for a license in KHLM as well
Merge branch 'release-4.5.0'