Move web.xml out of conf so it is not separately installed - EUCA-8616

EUCA-8616
Merge remote-tracking branch 'origin/dev/sjones/EUCA-8616' into testing