repairing mess from rebase, and cleanup problems with WAR files stemming from multi-binding refactor