Merge proposals dependent on lp://qastaging/~ipython-dev/ipython/kernel-config

lp://qastaging/~ipython-dev/ipython/kernel-config has no merge proposals.