Add err()/err_if_not_set()

Change-Id: Ib26d3dae2ab84484aca081a29a9318a4914284f7
Merge branch 'verify-javelin' into dt-test
Merge branch 'tools' into dt-test
Merge branch 'nova-clean' into dt-test