Michael Minella 5d08953b79 Resolved Cherry Pick conflicts ...

Refactored

Refactored based on conversations with wider team

Updates per code review

2016-09-08 11:42:34 -04:00

..

src/test

Minor polish

2016-07-26 14:52:31 -05:00

pom.xml

Resolved Cherry Pick conflicts

2016-09-08 11:42:34 -04:00