Added @APACHE_PID_PATH@ and @APACHE_BINARY@ for tok replacement and fixed typo HOSNAME to HOSTNAME.
Merge pull request #26 from jessp01/master

Added @APACHE_PID_PATH@ and @APACHE_BINARY@ for tok replacement and fixe...
Merge branch 'IX-9.11.0'

Conflicts:
	installer/installation.ini
Merge pull request #27 from kaltura/master

Master