Mark Derricutt Updated dependencies and Maven 4 version

Change-Id: I394db6eb4ba2985d68ec98905e99411419046def

cff6484