forward port from essex-hack-suse to pebbles

just a single commit in this barclamp