Yes, we should be merging the configs first.   
Also, this code can be much cleaner if we parse from a Map.   Note that I created a ConfigUtils, so you can do this:

    ConfigUtils.parseMap(Map("spark.fileserver.uri" -> httpFileServer.serverUri))