Getting horizon config inline with upstream

Addresses issue TA82