Merge "Un-hardcoding apache address"