LILY-189: make it possible for accountless contacts to be exported
Merge branch 'develop'