Combining Feature-Oriented and Aspect-Oriented Programming to Support Software Evolution