rename pf-xivo to xivo
Merge remote-tracking branch 'origin/rename_pf-xivo_to_xivo'