Merge Shrews - Add options to the GPB files that will be used by protoc when generating Java source files. Merge Andrew - fix bug 654568: Pandora --enable/disable message for plugins incorrect Merge Andrew - fix bug 653707: drizzle --shutdown reading table information