Make UpstreamLock more generic#4413

mozesl-nokia wants to merge 4 commits intokptdev:mainkptdev/kpt:mainfrom

nokia:locatornokia/kpt:locatorCopy head branch name to clipboard