lots of updates for 4.x, removing out-of-date bits
add several files from the older repo for contrib updates