[backport-1.6]: MR "Run nameSuffixHash validation early in bootstrap/apply scripts" needs a 1.6.x backport

MR !6599 (merged) needs to be backported to 1.6.x