Germany will extend its travel warning for non-European countries until the end of August but lift border controls to all its neighbours by mid-June, ministers said on Wednesday.