parser: Cleanup parser control flags, so they display as expected to user

Instead of having multiple tables, since we have room post split
of optimization and dump flags just move all the optimization and
dump flags into a common table.

We can if needed switch the flag entry size to a long in the future.

Signed-off-by: John Johansen <john.johansen@canonical.com>

parser/parser.h

@@ -83,9 +83,6 @@ extern int parser_token;
 		  WARN_OVERRIDE | WARN_INCLUDE)
 
 
-#define CONTROL_RULE_MERGE	0x1
-#define DUMP_RULE_MERGE		0x1
-
 typedef enum pattern_t pattern_t;