Merge https://github.com/nemomobile/nemo-configs-x86 into wayland_vm_configs

Conflicts:
	Makefile
	rpm/nemo-configs-x86.yaml