clean.sh updates

* Clean out data, log and state dirs
* include lib/apache to clear is_apache_enabled_service not found error

Change-Id: I33dfde17eb8daaaed7f7e76337fe6a8085a266bf
Merge branch 'screen-stop' into dt-test