CC should reject apps that specify both a custom buildpack and a docker image

[#75859568]
Merge remote-tracking branch 'origin/pr/280'

[#76992480]
Cleanup whitespace