More updates for Java 8 compatibility; Updates for Swagger 1.3.7