Merge "Expose flags for collapse resource name to 'convert' command."