Removed C++11 extensions warned about by clang

When building as C++03, clang warns that a comma after
the last enum element is a C++11 extension.  Removed commas.

Change-Id: Iae905663481f8315e1bfa65db46bca958fc66a51
Merge topic 'C++11-warnings' into master

1edea1c9 Removed C++11 extensions warned about by clang