Merge in Cesium changes from the kgrochow/esri-wkid branch.