Merge pull request #3469 from johnny-die-tulpe/devel

Fixed indention of vv() output
fixed check mode
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
Merge pull request #3477 from bcoca/fix_service_checkmode

fixed check mode for service module
Merge remote-tracking branch 'upstream/devel' into devel