Changed server detection from doc root to file exists
Merge branch 'refs/heads/dftaiwo' into liveBranch