Bug 12234 - dependency changes to allow master to build