Squashed commit of the following:

commit 6e8d9d71e2d1ad044ff8363aa73323e2b9c6fad1
Author: Nick Holub <nikholub@gmail.com>
Date:   Tue Mar 4 17:38:20 2014 -0800

    fix #MLHR-861 Installer - System Properties - IP List

commit 091bcea47166e29c235b58b2054aa59b5fb69110
Author: Nick Holub <nikholub@gmail.com>
Date:   Tue Mar 4 17:09:53 2014 -0800

    fix #MLHR-861 Installer - System Properties - IP List