Pull in all pom changes, merge, and review

Issue-ID: AAF-211
Change-Id: Ibc8550fac594af6d292690215e72664c20b3f837
Signed-off-by: Instrumental <jcgmisc@stl.gathman.org>
15 files changed