merging what I think was a botched merge
added missed changes
Merge branch '7.x'
getting in sync with upstream again
remove obsolete files