Use six.add_metaclass instead of __metaclass__

According to http://docs.openstack.org/developer/hacking/ it should
be preferred to use six.add_metaclass instead of __metaclass__.

Change-Id: Iec6550421bcf54f30952d9dc9f3a398288d6a283
Merge "Use six.add_metaclass instead of __metaclass__"