Resolve conflict mark + Update doc with latest version of 'cf-mgmt-config org -h' output
Resolve conflict mark + Update doc with latest version of 'cf-mgmt-config org -h' output

pivotalservices/cf-mgmt,pivotalservices/cf-mgmt