Checkout $branch before we reset

This will ensure we reset the correct ref.
Remove version workaround for openstack-tripleo

tripleo-incubator doesn't tag releases so doesn't
have the same problem as the other tripleo projects.
Fix typo (stray $)