update.py: Move Include/Comments higher in the entries
    
    By moving Include/Comments right after Name:, we make sure that if
    there is a change to these two fields, the default git three-line
    context wil include the header [...] line.