Updated MySQL to set where it's pid file is so mysql.server command workds
Merge remote-tracking branch 'origin/master'