beta: /usr/local/apache dupe definition

* Get rid of nfs::apache::labs which was a hack
* Move the /usr/local/apache definition for beta to
  applicationserver::config::apache

Fix the error:

err: Could not retrieve catalog from remote server: Error 400 on SERVER:
Duplicate definition: File[/usr/local/apache] is already defined in file
/etc/puppet/manifests/nfs.pp at line 187; cannot redefine at
/etc/puppet/modules/applicationserver/manifests/config/apache.pp:29 on
node i-0000031a.pmtpa.wmflabs

Change-Id: Ia2b663f9d3cb1749fbc85b290ddee974871e8ec7
Merge "beta: /usr/local/apache dupe definition" into production