WFLY-1521: Fix deployment tear downs

https://issues.jboss.org/browse/WFLY-1521