Add patch to enable deploy dir to work for sdks
Confused by merge failure
Still cleanning up this mess