Merge func Server.ListenAndServe with ListenAndServe

Docker-DCO-1.1-Signed-off-by: Roel Van Nyen <roel.vannyen@gmail.com> (github: RoelVanNyen)