Bahrain to complete airport upgrade by 2018-end