Fixed up minor bits around rules ordering and dependencies on mysql-client-5.6.