Porting to 2.5 stable + moving course_availability table creation to upgrade