Remove greedy match case and update with ArmAutoSolutionsConfig
class

Signed-off-by: Divin Raj <divin.raj@arm.com>