Art's Final Sync Updates

Merge and Sync of Art's infolnx7 updates for the windows web server