Merge changes from Juniper/web-controller to absingla/web-controller