Changed the class name for CiscoXrDevice to CiscoxrDevice to be
consistent with eval usage in push.py.
Merge branch 'xr'