Added CLIENT_ID and CLEAN_SESSION config parameters