Pull changes from bc-tparsons to BrightcoveConsultingReusableComponents