Merge "Yang errors fixes: - fixed keys - restored 'config true' state in references...