Fix fabfile and deploy templates: fix bug 973304