Merge "tcpAccECN: Move static const variables to file scope" into main