Fixes in accordance to code review.
Merge branch 'next' of github.com:SmartBear/loadui into next