Merge 1.9 changes into Head
Changes to remove ANT tokens for the turnkey install project
I'm adding the two jsp files that originated in the KNB skin developedby Matthew Brooke, modified for the PISCO skin.