Merge options: flush=attr and flush=coll

[Jesper Öqvist]

It seems unnecessary to have separate options for generating flushing methods for non-collection attributes and collection attributes.

Merging these options would slightly simplify the code generation for flushing.