Up to 3.6.5, switched deps to mariadb, removed obsolete patch items