[Merge] ~rikmills/unity:master into unity:master

[Khurshid Alam]

Window mocker tests won't run if it couldn't find it. https://git.launchpad.net/unity/tree/tests/autopilot/unity/tests/__init__.py#n23, 

So atm it's not an issue. I will discuss with Trevinho & remove the code later 

Thanks.
-- 
https://code.launchpad.net/~rikmills/unity/+git/unity/+merge/378891
Your team Unity Team is requested to review the proposed merge of ~rikmills/unity:master into unity:master.