Don't forget to set svn:eol-style property on our source files to ''native''
Testing: merge through r6020 from trunk.
Testing: Merge through r6014 from trunk; #5022 regression test now passes.
Testing: add FAILING regression test for #5022
Testing: merge through r6013 from trunk.
Testing: merged through r6011 from trunk
Testing: Add placeholder for #5572 feature regression test.
Testing: merge through r6010 from trunk (no test case; this is multi-project related)
Testing: merge through r6009 from trunk
Add unittests to cover #6011