Merge "Use content type specified on the command line" into oc-dev