Merge branch 'macsec-config-issues'