Merge "Bug 6051: Temporarly disable Neutron in build"