updated version numbers and message classes for release 1004
resolved conflict