Merge "Change reserveSecurityParameterIndex() to take a remoteAddress"