Ensure regression does not happen
Merge pull request #2199 from bcardarella/bc-addon-blueprint-package-fixes

Ensure regression does not happen