Merge "Skip secgroup invalid name/desc tests until bug 1161411 is fixed"