[Merge][CMake] Merged revisions : 6951

Revision  r6951
.----------------------
[dunecontrol]
Change default build dir from cmake-build to build-cmake to facilitate tab completion.

.----------------------


[[Imported from SVN: r7295]]