Bug1:  Added necessary properties to support UTF8 charset in persistence.xml
Merge remote-tracking branch 'origin/master'