Update 'execute_on' syntax

 (refs #3431 and #4407)