[UIMA-1832] merge trunk -> branch (picked up changes in xml descriptors for activemq tests)
5 files changed