Sync jb-dev to jb-ub-mail Exchange

* For convenience in Eclipse

Change-Id: I99da4238ed83f29c33bd9116faa66edc5c1429a7
9 files changed