checkout diego branch of cf-acceptance-tests; prevent update_sub from switchint it back to master