Merge console_control.h and console.h

Since these are topically the same thing, they can live together.

Signed-off-by: Peter Jones <pjones@redhat.com>