Merge branch 'pregmod-master' into 'pregmod-master'

Relax slaves' "choose own clothes" behavior under chattel religionism

Closes #4232

See merge request !11019