[#759] Fixed update and org pages
[#759] Reverted to old(er) version of Pipeline
Merge pull request #923 from akvo/issue/759_rsrv3_templates

[#759] Fixed update and org pages