backport changes from master branch

This brings default values for mappings, IFALIAS support, additional
device types support, and multiple fixes.