Merge pull request #1573 from jlipps/master

misc fixes
Fix scheme error by updating ForceQuitUnresponsiveApps
Merge pull request #1575 from bootstraponline/master

Fix scheme error by updating ForceQuitUnresponsiveApps
remove duplicate test and fix isScreenLocked test