Update to 1.5 upstream release, rebasing patches and updating to newer dh compat