Merge "Remove sae_pmkid_in_assoc=1 from configuration file" into main