add files that somehow disappeared

did I do a "mv" vs. "git mv"? But then there should be
duplicate files... Anyhow... ;)
Merge branch 'v5-stable' into v7-stable
fix import errors
Merge branch 'v7-stable' into v8-stable