Corrected the error codes and messages for 5.1. This is to fix PB failures introduced by the patch for bug #27643.