* BAEL-4401 * Update with master and resolve conflicts
initial commit in new module core-java-exceptions-3