NXP-10258: fix bad commit replacing test user...