Merge configuration for new layman version and move our repository definition.
Update genkernel.conf configuration.