Adaption of the 5.1.6 build clone to the new "storage" directory layer,
already done in the general tree by Jani.