moved fiel to correct path
up changelog
Merge branch 'jag/3.3-captiveportal-packaging' into 3.3