1059 newsynching

This can be merged now.  It will need a fair amount of testing on submit-dev.   I will try to remove the ES dependencies in time for RC2