adjustments for mainline merge
variable APACHE split into two (APACHE_SERVICE and APACHE_CONF) for distribution compability
Merge pull request #87 from azet/master

SuSE compability (Apache) added
missing include
Merge branch 'master' of github.com:cvmfs/cvmfs
typo