New upstream version and other minor fixes

This merges upstream version 1.0.2, which is required by latest ulogd2. Other minor fixes included.