Merge "Re-Add bigswitch agent support"