Simplification of the risk calculators

By making use of the new features in commonlib it is possible to throw away several line of codes in the engine.  The tests are running here: https://ci.openquake.org/job/zdevel_oq-engine/917