[2.21] Add a mock --custom-namespace option to enable run of MR with custom ns

[2.21] Add a mock --custom-namespace option to enable run of MR with custom ns #368