Coverage build updates
Extended wait times on async unit tests to 5 seconds
Merge branch 'master' into dev-master
Merge branch 'dev-master' into dev-3.x