Merge "ncomp-openstack: Enable CLM scan job"