The "on duplicate" does not work in hsql DB, changed to "on conflict"#21

Awwabsiddiqui wants to merge 2 commits intoigniterealtime:mainigniterealtime/openfire-pushserver-plugin:mainfrom

Awwabsiddiqui:mainAwwabsiddiqui/openfire-pushserver-plugin:mainCopy head branch name to clipboard