Merge proposals dependent on lp:~bladernr/checkbox/1352376-fix-get_make_and_model-device-tree

1. 1352376-fix-get_make_and_model-device-tree
2. Dependent merge proposals