In custom plugin test check also multiply definition disk in base and wrapper cookbooks
Minor updates of templates