Workaround Sun C++ 5.9 compiler crash

Adjust whitespace in Source/CPack/cpack.cxx to avoid a strange
internal compiler crash.
Merge topic 'remove-c_str-calls' into next

3be265b3 Workaround Sun C++ 5.9 compiler crash
Merge topic 'remove-c_str-calls'

3be265b3 Workaround Sun C++ 5.9 compiler crash
af8a1643 Remove c_str calls when using stream APIs.
21c573f6 Remove some c_str() calls.
Merge branch 'master' into next