don't update old vcap_setup Amended to address Jesse's review comments. Amended to remove submodule update for services. Change-Id: Id22dbb005275b99017d132ed6e50f4035e394206