bug 735: Fix minor syntax errors

Change-Id: I7f384afb74e549456bc1ddfd91a4ce8ad21b8ec8
Merge branch 'master' into staging