Does upgrading units count towards this or do you need to actually build the unit from scratch?

You need to build or buy, I believe, including all unique units. Also it seems it still doesn't work post patch.