Move all devicelock stuff together, makes for easier reading with less ifdefs

Signed-off-by: Philippe De Swert <philippe.deswert@jollamobile.com>
Fix packaging names as rpm is a sucky package format.

Signed-off-by: Philippe De Swert <philippe.deswert@jollamobile.com>