Bug 1024289: Part 1: remove redundant subquery from combined view and add upgrade path. r=rnewman
Bug 1024289: Part 2: remove redundant null checks from combined view. r=rnewman
Bug 1024289: Part 3: remove display column from combined view. r=rnewman