#953 - Remove the dependency on broadleaf-common from functional tests