Merge "Use nose skip exception conditionally"