Fix xilinx tests
Fix number of users test
Merge branch 'master' into remove_zsi_xmlrpc
Fix XML-RPC related tests