Merge changes from topic "vendor_sku"

* changes:
  Also check empty SKU if SKUS are not defined
  Vendor SKU manifests: define env variables properly