Merge pull request #3348 from clumens/attrd-flags
Move settings in attribute_s into their own flags field