Cleanup cp.push and file_recv_max_size options
Merge pull request #15080 from cachedout/cp_cleanup

Cleanup cp.push and file_recv_max_size options