Merge from upstream

Handle BoxURL prior to validating config
Confirm server destroy