Don't project non list elements in flattening operator

There was a similar fix for wildcards.  The flattening operator
needs this behavior as well.
Merge branch 'fix-flattening-none' into develop

* fix-flattening-none:
  Don't project non list elements in flattening operator