Upstream 02 06 2014

Fixes for timeout in PAL
Fixed integration endpoint configs