Use `&&` and `||` instead of `and` and `or`

Signed-off-by: crynobone <crynobone@gmail.com>
remove irrelevant services.manifest file since it now set to
meta/services.json

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1'