Tweak timeouts based on recent failures

Also remove useless dataset (devstack_150)

Change-Id: I000e77d80bf326701225b9e21fb0816e4a002748