From: remillet <remillet@yahoo.com>
Date: Thu, 2 Jun 2016 21:37:52 +0000 (-0700)
Subject: Merge branch 'CSPACE-6953'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=9bb13f3618dfeaf30371b9fbeda68238f20e1b80;p=tmp%2Fjakarta-migration.git

Merge branch 'CSPACE-6953'
---

9bb13f3618dfeaf30371b9fbeda68238f20e1b80