Switch to build process enabling out-of-tree build and packaging
merge conflicts fixed
Merge branch 'nohal-master'