Merge proposals dependent on lp://qastaging/~davclark/ipython/traits-rename

lp://qastaging/~davclark/ipython/traits-rename has no merge proposals.