re: Avengers: Age of Ultron trailer

It's the right direction, regardless. They won't pull directly, panel by panel, from Civil War, but those who have read the script state that it's going that route. Stark being a main character in Cap 3 and not in IM 4 pretty much confirms it.