mon: mark dir as upstart managed

ceph-disk-activate will now do the same for the osd dir.
new: fix error message when keyring exists

Signed-off-by: Sage Weil <sage@inktank.com>