merge updates

Support building spark under http proxy environment