Fixes #343 - bugs applying for a prod marketplace
Merge pull request #373 from kleinsch/apply-fixes

Prod Marketplace Application Bugfixes