Fix up some of these best guesses.

Try to support os-release

Change-Id: I0000f7175f7261aadea8cabb16ce39f5c154a079
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>