changed localheader.jsp include path
Merge branches 'master' and 'TRUNK-1906'