(cherry picked from commit 17da88b5b1)
17da88b5b1
Resolves: RHEL-61261
Also update license tags to SPDX compatible identifiers Resolves: RHEL-54266