document interactive command line option
only do innoDB upgrade if interactive
Merge branch 'master' into zmupdatefixes

Conflicts:
	scripts/zmupdate.pl.in
fix putting the mode back. I merged it to the wrong place
Merge pull request #584 from ZoneMinder/zmupdatefixes

Zmupdatefixes
Convert french lang file to UTF-8
Merge pull request #589 from manupap1/fr_lang_fix

Convert french lang file to UTF-8

Thanks again for your efforts!
Update zm.in

The legacy sysv init script will not work with systemd.  This is by design.
Merge branch 'master' into iconnor

Conflicts:
	scripts/zmupdate.pl.in