Merge "Configuration integrationtest to test save config functionality"