Added more 5.x to 6 import changes (no impact on live code)
Merge branch 'master' of github.com:clearos/app-configuration-backup