Fix warning about comma at end of enum list.

Officially, C++ syntax did not allow an enum list to end in a comma
until C++11.  Therefore, it comes up as a pedantic warning.

Change-Id: I0f7697827c0b92af4c8684259fe414af42edb095
Merge topic 'enum-comma-warning' into master

18f678ac Fix warning about comma at end of enum list.