Merge all changes from halfhalo/refactor into master

Update master to a version known to work with the current master of meta-webos/build-webos.