Standardize the maven parameter names
Merge branch 'master' into tourapp
Standardize the maven parameter names