Re: fixes for task #403 - private cloud / mock driver support