Added ability to override path to index files in localhost links and port/batch commands
Merge remote-tracking branch: upstream/master