Updated build file clean double server watch
Merge commit '0f51545c6712fbb6bc28ca95acb1f2439adfd824' into HEAD