diskless-generator: check value of mount.usr= and usr=

systemd 217 added mount.usr= which replaces our own usr= option.
Avoid engaging the diskless logic if the new option is used.
Merge pull request #40 from marineam/systemd

diskless-generator: check value of mount.usr= and usr=