SWF-3062 : Fix mysql configuration for old 4.1 builds
Remove deleted feature branche