Docker updates

@jgmize r? Docker related changes, some backported from masterfirefoxos.
On travis at least we're still using 9.1. Should that be changed too?