E0d/fix conflicts

@adampalay @jarv @dmitchell @wedaly @jzoldak 

This branch resolved merge conflict between master and release.  Can you please review.  The tests failed, but they've been failing for a bit today, so I'm not sure if this is related

We can't have a new rc until we get to the bottom of these conflicts.