The Ordinary Weight conjecture and Dade's Projective Conjecture for p-blocks with an extra-special defect group