CA-136771 CA-136767 Improve deprecation messages to be applicable to next version of XenServer