Merge "don't assume there is an ExtServices package" into nyc-dev