Merge "Rename createSecurityAssociation() to updateSecurityAssociation()"