Backports patches from grilo-plugins master to support libdmapshare's 4.0 API. Signed-off-by: W. Michael Petullo <mike@flyn.org>