some changes
Merge remote-tracking branch 'nest/master'

Conflicts:
	arcteryx-meta-beans/src/main/java/com/github/nest/arcteryx/meta/beans/internal/SpringEhCacheBeanCacheProvider.java