Merge "Remove unnecessary secgroup attrs from scenario tests"