Merge "OMS: 'cmd overlay lookup': support --user"