Fixes bug with removing the attributeService from core hibachi
Merge branch 'develop' into feature-reporting