Merge "Fix broken fail_json in zuul_console"