Boundary Layer and Uniform Asymptotic Expansions for Diffraction Problems