merged with cdrnet changes

Merged with cdrnet changes and combined templates. Better enum support
and template. handle showing enum int or hex values