travis fixes for 10
pure travis branch for 10-stable
removing comment per request.