Fix for missing dependency in dist-server

https://reviews.apache.org/r/20209/
Fix for gadget proxy request URI

https://reviews.apache.org/r/20207/