fixed non-working monitor call from services in Op5
fixed nonworking keyring in Linux
threadified op5 send_command
fixed merge conflicts

Change-Id: I11cac6c750873cd3a5bcbe8474ccc6b0a37c149f
Signed-off-by: Mattias Ryrlén <mattiasr@op5.com>
Merge remote-tracking branch 'upstream/master'