backport from trunk (rev #9650):
fixed default values for the primary_ip and alternate_ip parameters
better documentation