Improve the check_eth check

This improves the check_eth script introduced in

700cb5f6512aa151f99a99c672395d3b09d5a2dd

by adding the ideas presented in

Id5130db48c14b87752197ce8f0b022ef13e40e4b

The idea is to have a single check and not two and at the same time make
sure the entire infrastructure is working as configured

Change-Id: I4a7a2c71be40941f812c4bcfa49c7ccb25ab36db
Merge "Improve the check_eth check" into production