Removed AdviceBuilder, since isMockEndpointsAndSkip is probably simpler to understand.
Merge remote-tracking branch 'origin/master'