install xivo-fai* twice

problem was: apt-get install xivo-fai removed xivo-fai ... so install
it again and this time it really installs
Merge branch 'xivo-fai-hotfix'

Conflicts:
	xivo-upgrade/bin/real-xivo-upgrade