updated test to read mysql option from ~/.my.cnf
Merge branch 'dev' into merger
Merge remote-tracking branch 'upstream/package-centos6' into package-centos6