rename pf-xivo to xivo
Merge branch 'rename_pf-xivo_to_xivo'