Partially revert default niceShortFormat

In 9fa531d6e3a3d0291ea36ccd9f0b9f2ab1d9f11b the default niceShortFormat
was changed, which has been interpreted as a regression in #3533.

This change partially reverts the previous change and tries to strike
a balance between the old behavior and new.

Refs #3533
Merge pull request #1073 from cakephp/issue-3533

Partially revert default niceShortFormat

The changes introduced in 2.2 dramatically changed the output from 2.1, this change attempts to be a compromise between the 2.1 format and the 2.2 format.

Fixes #3533