rpc_mapproject: Merge from orthoproject things which are better there