Forward port essex-hack-suse changes to pebbles