GDA-6009 support testing of new configuration
GDA-6009 Don't test final merge just yet
GDA-6009 fix commit message text