backport rh_ip support for 2014.1 branch
Merge pull request #15814 from thatch45/2014.1

backport rh_ip support for 2014.1 branch