Added udisks2 reference and some conflicts against the new E17 desktop package.