Amend "Update caching proxy squid configuration"

Properly support both squid2 and squid3 in the caching proxy setup.

Change-Id: Ie85c650e85ad7e61a594f1bfb3ed2fdaee35759a