CDAP-538: More minor text updates.