Change Daemon class to better match process command lines.

Add additional uuid argument Daemon class to help it better
match output from /proc/$id/cmdline to the correct daemon.
If there is a stale pid in the pidfile, and that process has
the same name, then it could match accidentally and not
start the daemon up properly.

Fixes bug 1177416

Change-Id: I1109ca73c539c5e96cbe3dbb55ce68c92013ee10
Fix usage of SQLAlchemy Query.first() method

Query.first() doesn't raise the NoResultFound exception
if no result is found but rather returns None, so wrapping
of Query.first() call into a try/except NoResultFound block
is useless.

Fixes bug 1177842.

Change-Id: I0bd0e6d8299734b485dd1a1ac36bf6c295fd8932
Merge "Fix usage of SQLAlchemy Query.first() method"
Merge "Change Daemon class to better match process command lines."