Berlin police deploy in force, face calmer New Year's Eve