only set address if all address fields are non-null
Merge branch 'develop' of github.com:praekelt/jmbo-neo into develop