Merge "FormatJson: cleanup after PHP 5.5 support removal"