proxy: move header.jsp to defaults - closes #591
Merge branch '13.09' into 14.01
Merge branch '14.01'