fixing issues where aemVersion was used without props prefix
spacing
sling models support
bnd annotations