logind work around and clean ups

logind work around and clean ups

Signed-off-by: Chuck Short <chuck.short@canonical.com>