Address some comments from Nick Coghlan
Merge with 3.4 for porting HOWTO tweaks
Removes use of ValueOrDefault function that is not always available on the buildbots.