Bug 859125 Clean up confvars.sh and configure.in also unbreak some external API build bustage r=Standard8
Bug 866223 Compose windows are no longer recycled r=Standard8