First pass changes to update junits to Pivotal CF/v2