update payment serve configurations
Merge branch 'development' into qa
Merge branch 'development' into qa
Merge branch 'development' into qa
Merge branch 'development' into qa
Merge branch 'development' into qa
Merge branch 'development' into qa