MDL-38923 theme_bootstrapbase: tidied up dock implementation