Fix mkOverride call
Don't copy Nix expressions to the store while processing Apache subservices
Fix evaluation error in the tomcat test