Updated deployment descriptors to be in line with recent config changes.