Add additional logic with tests to restore the previous behaviour when writing the principals file. Fixes: #36212 --------- Signed-off-by: Peter Verraedt <[email protected]> Co-authored-by: wxiaoguang <[email protected]>
