Merge "eix enterprise config storage bugs"