Fix merge issues
Fix merge issues

The orphaned sandbox tests added new uses of "aq manage", but it now
generates some output.

Change-Id: Icb202d3dd4e4a8e5bda4c27349ee1078008604e2

guillaume-philippon/aquilon,quattor/aquilon,guillaume-philippon/aquilon,quattor/aquilon,guillaume-philippon/aquilon,quattor/aquilon