[UIMA-1756] post merge back to trunk - update branch info re: merge (no files changed)