initial fix for KNIFE-248. Added helper methods for primary public and private IP addresses since the Fog methods are not very accurate here.
KNIFE-248 merge
0.7.0 merge for KNIFE-248