Merge "Increase timeout for clamp-maven-clm-master"