Merge "Make Deploy/UpdateIdentifier definition semi-consistent"