Merge "Change the way to detect monit configuration dir"