[MERGE] from trunk
[PATCH] sle
[WIP] rev me
merge upstream
[FIX] do not rolback cursor in test mode
[FIX] phantomjs: don't use error method because it's undefined in phantomjs evaluating  environment
[MERGE] from trunk
[MERGE] from trunk
[FIX] phantomjs: hide error if document.body does not exists
[IMP] post install for test running; fix phantomjs and run test
Merge branch 'master' of bzr::lp:openobject-server