Fixed merge conflicts and update docs to current workflow.
Fixed merge conflicts and update docs to current workflow.

[#160941813]

Co-authored-by: An Yu <446e9838deaeb979640d56c46523b7c882d598cd@pivotal.io>

cloudfoundry/docs-buildpacks