proposed changes for STRATOS-680

[chris snow]

Hi Devs,

When you get a chance, could you please review the proposed changes
here: https://issues.apache.org/jira/browse/STRATOS-680

Many thanks,

Chris