Merge up Augeas fixes