Merged l1upgrade-skeleton from repository mulhearn
first pass at trigger upgrade emulation