Merge pull request #1985 from oalbrigt/IPaddr2-fixes
IPaddr2: improve fail logic and check ip_status after adding IP