Change big variant rabl template to have consistent image structure with small variant rabl template. Fix potentially colliding cache keys.

Signed-off-by: Jordan Brough <git.j@brgh.net>

Fixes #4457
remove mail method configuration

Fixes #4377