Reflect VCAP values
Update waiter.js
+merge