- Backport #141 fixes #142 - This seem to relate with machine build from an annotation config which is then used as a session scoped bean. - Fix autostart usage where appropriate and also fix some test which were using wrong logic to determine autostart usage(tests were wrong).