Docker updates

@jgmize r? Docker related changes, some backported from masterfirefoxos.
Nice catch, thnx!