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