Test with 5.20 and 5.21 on Travis

Change-Id: I7b28c367e2b8e39eaace5db292c83450f5535c4b