Rename --width-* namespace to --container-*
#14898
Merged
--width-* namespace to --container-*
#14898