renumber master enums to avoid mr1 collision

Test: make
Change-Id: Ib780f9de95a90a7a2ada61449b4bbf47a8b60a9d
1 file changed