[Merge] lp:~3v1n0/nux/x11-conffile-on-unity-only into lp:nux/bionic

[Iain Lane]

Review: Approve

thanks for the update

Please update the bug description before publishing the SRU. I also suggest you explain the gtest.m4 bit as this might be confusing for the reviewer.
-- 
https://code.launchpad.net/~3v1n0/nux/x11-conffile-on-unity-only/+merge/347863
Your team Unity Team is subscribed to branch lp:nux/bionic.