Adapt to libhaloc changes
Merge branch 'indigo-devel' into indigo