CONN-1351: Moved the custom proeprties to gateway.properties file