Gravar-mail: Revisiting the Fe xvii Line Emission Problem: Laboratory Measurements of the 3s-2p and 3d-2p Line-formation Channels