dockerfile.Config is almost redundant with ImageBuildOptions. Unify the two so that the latter can be removed. This also helps build's API endpoint code to be less dependent on package dockerfile. Signed-off-by: Anusha Ragunathan <anusha@docker.com> Upstream-commit: 5190794f1d85d5406611eb69c270df62ac1cdc7f Component: engine