[Crossport] numa option parsing fixes (v3)

This is a crossport from 1.4, including commits as follows:

e3f9fe2d404ca10153e95499ece111c077b6690a

8f302cb0900ba7f38b62da5759f07b77483d6fb9

12e53a9d59c8cb272a423e1db036324579a3c697

ca4c6d363153f19abf3ffdf0ca1532daa581867d

e4ce85b25838694d2d7396b5e969eb4830329631

5f1399651eaab1b04e49107250d182968a227aa6

845e5bf9cd49873c72f84796cabf107c3f520f37

c881e20eed4911ab6f8c674f2b1bf225a2cdde71