Merge pull request #139 from maksimov/2014.03

Fix for Windows VM password capabilities (FB 4319)
Fixed a unit-test error